Mark previously deprecated SSL settings as obsolete #183
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
- SSL settings that were marked deprecated in version `3.15.0` are now marked obsolete, and will prevent the plugin from starting. - These settings are: - `ca_file`, which should be replaced by `ssl_certificate_authorities` - `keystore`, which should be replaced by `ssl_keystore_path` - `keystore_password`, which should be replaced by `ssl_keystore_password` - `keystore_type`, which should be replaced by `ssl_keystore_password` - `ssl`, which should be replaced by `ssl_enabled`
robbavey
force-pushed
the
obsolete_ssl
branch
from
ced1b0b to
e39d7ba
Compare
donoghuc
reviewed
Dec 16, 2024
7 tasks
donoghuc
reviewed
Dec 16, 2024
donoghuc
reviewed
Dec 16, 2024
donoghuc
requested changes
Dec 16, 2024
There was a problem hiding this comment.
The setup of ssl parameters seems a bit complex now:
def setup_ssl_params!
# Infer the value if neither the deprecate `ssl` and `ssl_enabled` were set
infer_ssl_enabled_from_hosts
end
def infer_ssl_enabled_from_hosts
return if original_params.include?('ssl_enabled')
@ssl_enabled = params['ssl_enabled'] = effectively_ssl?
end
def effectively_ssl?
return true if @ssl_enabled
hosts = Array(@hosts)
return false if hosts.nil? || hosts.empty?
hosts.all? { |host| host && host.to_s.start_with?("https") }
endI think that boils down to just:
def setup_ssl!
return if original_params.include?('ssl_enabled')
@ssl_enabled = if @ssl_enabled
true
else
Array(@hosts).all? { |host| host && host.to_s.start_with?("https") }
end
params['ssl_enabled'] = @ssl_enabled
endThough i'm not entirely sure what mutating params does in this. In general the params scope is kind of a mystery to me 😅
robbavey
force-pushed
the
obsolete_ssl
branch
from
8fe5229 to
0a28120
Compare
robbavey
force-pushed
the
obsolete_ssl
branch
from
0a28120 to
be18f6f
Compare
|
This was about as simple as I could get to: |
|
Over to @karenzone for doc review |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
3.15.0are now marked obsolete, and will prevent the plugin from starting.ca_file, which should be replaced byssl_certificate_authoritieskeystore, which should be replaced byssl_keystore_pathkeystore_password, which should be replaced byssl_keystore_passwordkeystore_type, which should be replaced byssl_keystore_passwordssl, which should be replaced byssl_enabledRelates: #179